Feature/foundation work