Dev/get working