Features/foundation update

@effkay Please merge