Finish first version with very hacky code