finished basic phase 1 features